Merge remote-tracking branch 'upstream/master'

diff --cc Cargo.lock
Simple merge

diff --cc src/cargo/ops/cargo_new.rs
Simple merge

diff --cc src/cargo/util/flock.rs
index a4621dbeae48733c4d4a868c3fe9d6630483e013,861dd4f735704fe902131d26295127a370bfbfb0..1be77b2d843fd19e8cf5b375ba8622eb2444b92c
--- 1/src/cargo/util/flock.rs
--- 2/src/cargo/util/flock.rs
+++ b/src/cargo/util/flock.rs
@@@ -289,10 -288,10 +289,10 @@@ fn acquire(config: &Config
          }
      }
      let msg = format!("waiting for file lock on {}", msg);
-     config.shell().err().say_status("Blocking", &msg, CYAN, true)?;
+     config.shell().status_with_color("Blocking", &msg, CYAN)?;
  
 -    return block().chain_error(|| {
 -        human(format!("failed to lock file: {}", path.display()))
 +    return block().chain_err(|| {
 +        format!("failed to lock file: {}", path.display())
      });
  
      #[cfg(all(target_os = "linux", not(target_env = "musl")))]